Merge branch 'upstream' into 3.10.0beta
authorStefano Zacchiroli <zack@debian.org>
Wed, 13 Jun 2007 12:34:29 +0000 (12:34 +0000)
committerStefano Zacchiroli <zack@debian.org>
Wed, 13 Jun 2007 12:34:29 +0000 (12:34 +0000)
commitb0fe926ce1513aaeb8c553add03df069681abcf7
tree81d34f64f423bfc41ba2bae03c74a496bf52f337
parente33322f9497a3c44d8e7972a8e4db1fbae409f68
parent5c3619e50d03c88ebe787d9b1602ed71c058d047
Merge branch 'upstream' into 3.10.0beta